From: Giovanni Campagna Date: Thu, 13 Feb 2014 00:04:58 +0000 (+0100) Subject: Don't send all debug messages to Telepathy X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2801 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f6240e114c8c6bf3be2d3450deaabc68f165f4c5;p=gnome-shell.git Don't send all debug messages to Telepathy The log handler can be invoked at bad times, and in particular it can be invoked from gsignal with the signal lock taken. At that time, calling into arbitrary high-level APIs can cause a dead-lock. Instead, only send to telepathy the tp-glib debug messages. Everything else is in the journal anyway. https://bugzilla.gnome.org/show_bug.cgi?id=724256 --- diff --git a/src/main.c b/src/main.c index 99494a04d..55f668394 100644 --- a/src/main.c +++ b/src/main.c @@ -271,7 +271,9 @@ default_log_handler (const char *log_domain, g_get_current_time (&now); - tp_debug_sender_add_message (sender, &now, log_domain, log_level, message); + /* Send telepathy debug through DBus */ + if (log_domain != NULL && g_str_has_prefix (log_domain, "tp-glib")) + tp_debug_sender_add_message (sender, &now, log_domain, log_level, message); /* Filter out telepathy-glib logs, we don't want to flood Shell's output * with those. */